From: Daiki Ueno <dueno@redhat.com>
Date: Mon, 24 Mar 2025 12:25:12 +0000 (+0900)
Subject: Fix build error with --with-ed25519-libsodium and --with-openssl
X-Git-Tag: archive/raspbian/2025.7-2+rpi1^2^2~6^2~4^2~44^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bd2a9753e5227c97bda737e00a00451d361449f3;p=ostree.git

Fix build error with --with-ed25519-libsodium and --with-openssl

While libotcore can be configured with those options individually, the
latter is always required for OpenSSL's EVP functions. This splits the
ifdefs to accommodate that.

Signed-off-by: Daiki Ueno <dueno@redhat.com>
---

diff --git a/src/libotcore/otcore.h b/src/libotcore/otcore.h
index ceeb1a92..3ce8f2a3 100644
--- a/src/libotcore/otcore.h
+++ b/src/libotcore/otcore.h
@@ -25,7 +25,9 @@
 #ifdef HAVE_LIBSODIUM
 #include <sodium.h>
 #define USE_LIBSODIUM
-#elif defined(HAVE_OPENSSL)
+#endif
+
+#if defined(HAVE_OPENSSL)
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #define USE_OPENSSL